Add xrealloc, xstrappend.

Fix typo in be_read16.

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index f836cec31f740c69875d39d4705866ae9f1581b4..1c9fe09d085216cef67cffbdedba53993c78c04a 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -217,6 +217,8 @@ void printposn(const coord *c, int is_lat);
 void *xcalloc(size_t nmemb, size_t size);
 void *xmalloc(size_t size);
 char *xstrdup(const char *s);
+char *xstrappend(char *src, const char *new);
+
 void rtrim(char *s);
 signed int get_tz_offset(void);
 

diff --git a/gpsbabel/util.c b/gpsbabel/util.c
index 3e64373c898870ddf0b38b84d9c4c9b2add8fb86..2ea444037e7299c5b6d031b212af3108b8aee433 100644 (file)
--- a/gpsbabel/util.c
+++ b/gpsbabel/util.c
@@ -60,6 +60,39 @@ xstrdup(const char *s)
        return o;
 }
 
+void *
+xrealloc(void *p, size_t s)
+{
+       char *o = realloc(p,s);
+
+       if (!o) {
+               fatal("gpsbabel: Unable to realloc %d bytes of memory.\n", s);
+                       }
+
+       return o;
+}
+
+/*
+* For an allocated string, realloc it and append 's'
+*/
+char *
+xstrappend(char *src, const char *new)
+{
+       size_t newsz;
+
+       if (!src) {
+               return(xstrdup(new));
+       }
+
+       newsz = strlen(src) + strlen(new) + 1;
+       src = xrealloc(src, newsz);
+       strcat(src, new);
+
+       return src;
+}
+
+
+
 void 
 rtrim(char *s)
 {
@@ -129,8 +162,8 @@ be_read32(void *p)
 signed int
 be_read16(void *p)
 {
-       char *i = (char *) p;
-       return i[0] << 8 | i[0];
+       unsigned char *i = (unsigned char *) p;
+       return i[0] << 8 | i[1];
 }
 
 void